Custom Skin Upgrades
Design and Skin Customization
If you don't want to clone the skin, then instead use the Template Editor for changes:
Docs: "Using the template editor"
https://www.jamroom.net/the-jamroom-network/documentation/jamroom-admin-handbook/3183/using-the-template-editor
Any template not changed will get the update. any template changed will require merging.
If you have a better idea on how to manage the cloned skins, we're open to ideas.
What it sounds like you're asking:
ORIGINAL TEMPLATE:
This is some text, the color is blue
Balloon rides 30 min $60
This is some text, the color is red
Cant think of any other way than manual merge to not screw up the cloned skin. Seams like the way version control systems (ie GIT ) do it too, by asking for manual input.